bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 13 Mar 2005 09:39:14 +0000 (09:39 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Sun, 13 Mar 2005 09:39:14 +0000 (09:39 +0000)
commit5f53c9cfb806550887ac8f510d0e21d1bb3bbe9f
treecb39734e5131375905929c64e1bc67ff98135977
parent504b288f7c233e7b89794f3986d48a83a946de2d
parent619ad08f6f503babbe1e0a225915647c50a3cec5
bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q)

Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>
linux-2.6.11-xen-sparse/include/asm-xen/hypervisor.h
tools/python/xen/xend/server/SrvDaemon.py
xen/include/public/xen.h